From 333b013f7fd3a3adf8036c20bcb52cf69bb67511 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 10 Jul 2020 16:12:25 +0100 Subject: [PATCH] Increase the default timeout for slow tests If a test is part of the 'slow' test suite, we should increment the default timeout to compensate. --- testsuite/gtk/meson.build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build index a93540dd80..d725d992f6 100644 --- a/testsuite/gtk/meson.build +++ b/testsuite/gtk/meson.build @@ -107,6 +107,8 @@ foreach t : tests test_srcs = ['@0@.c'.format(test_name)] + t.get(1, []) test_extra_cargs = t.get(2, []) test_extra_ldflags = t.get(3, []) + test_extra_suites = t.get(4, []) + test_timeout = 60 test_exe = executable(test_name, test_srcs, c_args : test_cargs + test_extra_cargs, @@ -117,17 +119,21 @@ foreach t : tests expect_fail = xfail.contains(test_name) + if test_extra_suites.contains('slow') + test_timeout = 90 + endif + test(test_name, test_exe, args: [ '--tap', '-k' ], protocol: 'tap', - timeout: 60, + timeout: test_timeout, env: [ 'NO_AT_BRIDGE=1', 'GSK_RENDERER=cairo', 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()), 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), ], - suite: 'gtk', + suite: ['gtk'] + test_extra_suites, should_fail: expect_fail, ) endforeach -- 2.30.2